Merge version 22.22.0+dfsg+~cs22.19.6-1+rpi1 and 22.22.1+dfsg+~cs22.19.15-1 to produc...

diff --cc debian/changelog
index 05d61805af1235fc0e9e76bbf3ee96a899d974b0,0f73e04ebdf5e2f6c15291dfc112601f603500a0..8a5ab1260f28d1be4d19634f7935d6e56b96c6b7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,39 +1,48 @@@
- nodejs (22.22.0+dfsg+~cs22.19.6-1+rpi1) forky-staging; urgency=medium
++nodejs (22.22.1+dfsg+~cs22.19.15-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 18.10.0+dfsg-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 15 Nov 2022 03:51:54 +0000]
 +  * Set --with-arm-version=6 on raspbian.
 +  * Use armv6k CFLAGS on raspbian.
 +  * Disable testsuite.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 26 Feb 2026 20:09:18 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 20 Mar 2026 09:25:18 +0000
++
+ nodejs (22.22.1+dfsg+~cs22.19.15-1) unstable; urgency=medium
+ 
+   * New upstream version 22.22.1+dfsg+~cs22.19.15
+   * Drop fix-riscv64 patch, applied upstream
+   * Drop "no amaro" patch, solved upstream
+   * Skip parallel/test-tls-ocsp-callback. Closes: #1130439.
+   * Refresh patches
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Wed, 11 Mar 2026 23:32:21 +0100
+ 
+ nodejs (22.22.0+dfsg+~cs22.19.13-2) unstable; urgency=medium
+ 
+   * Mark icu test as flaky. Closes: #1129368.
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Sun, 01 Mar 2026 15:44:04 +0100
+ 
+ nodejs (22.22.0+dfsg+~cs22.19.13-1) unstable; urgency=medium
+ 
+   [ Bastien Roucariès ]
+   * Increase build timeout
+   * Add stricter acorn depends
+ 
+   [ Jérémy Lal ]
+   * New upstream version 22.22.0+dfsg+~cs22.19.13
+   * Do not test process.versions
+   * Drop ada, use ada-url
+   * Disable all nghttp2 tests for now
+   * Avoid useless python version check in configure. Closes: #1127459.
+ 
+  -- Jérémy Lal <kapouer@melix.org>  Thu, 26 Feb 2026 23:26:49 +0100
+ 
+ nodejs (22.22.0+dfsg+~cs22.19.6-2) unstable; urgency=medium
+ 
+   * Rebuild with newer acorn
+ 
+  -- Bastien Roucariès <rouca@debian.org>  Tue, 24 Feb 2026 01:14:04 +0100
  
  nodejs (22.22.0+dfsg+~cs22.19.6-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge